Released GTK+ 1.1.6

Tue Dec  8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>

        * Released GTK+ 1.1.6

        * NEWS: updated

        * gtk/Makefile.am:
          gtk/testgtk.c:
          gtk/gtkrc.h:
          gtk/gtkrc.c: Read in default files.

diff --git a/ChangeLog b/ChangeLog
index f6e75a4e5dce12ffbf289b53223b99290cc399f8..f2a748df01b7aa3282d0bbcb8528e4f72008488a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Dec  8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.6
+
+       * NEWS: updated
+
+        * gtk/Makefile.am:
+          gtk/testgtk.c:
+          gtk/gtkrc.h:
+          gtk/gtkrc.c: Read in default files.
+
 Wed Dec  9 00:49:12 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f6e75a4e5dce12ffbf289b53223b99290cc399f8..f2a748df01b7aa3282d0bbcb8528e4f72008488a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Tue Dec  8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.6
+
+       * NEWS: updated
+
+        * gtk/Makefile.am:
+          gtk/testgtk.c:
+          gtk/gtkrc.h:
+          gtk/gtkrc.c: Read in default files.
+
 Wed Dec  9 00:49:12 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f6e75a4e5dce12ffbf289b53223b99290cc399f8..f2a748df01b7aa3282d0bbcb8528e4f72008488a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Tue Dec  8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.6
+
+       * NEWS: updated
+
+        * gtk/Makefile.am:
+          gtk/testgtk.c:
+          gtk/gtkrc.h:
+          gtk/gtkrc.c: Read in default files.
+
 Wed Dec  9 00:49:12 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f6e75a4e5dce12ffbf289b53223b99290cc399f8..f2a748df01b7aa3282d0bbcb8528e4f72008488a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Tue Dec  8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.6
+
+       * NEWS: updated
+
+        * gtk/Makefile.am:
+          gtk/testgtk.c:
+          gtk/gtkrc.h:
+          gtk/gtkrc.c: Read in default files.
+
 Wed Dec  9 00:49:12 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f6e75a4e5dce12ffbf289b53223b99290cc399f8..f2a748df01b7aa3282d0bbcb8528e4f72008488a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Tue Dec  8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.6
+
+       * NEWS: updated
+
+        * gtk/Makefile.am:
+          gtk/testgtk.c:
+          gtk/gtkrc.h:
+          gtk/gtkrc.c: Read in default files.
+
 Wed Dec  9 00:49:12 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f6e75a4e5dce12ffbf289b53223b99290cc399f8..f2a748df01b7aa3282d0bbcb8528e4f72008488a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Tue Dec  8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.6
+
+       * NEWS: updated
+
+        * gtk/Makefile.am:
+          gtk/testgtk.c:
+          gtk/gtkrc.h:
+          gtk/gtkrc.c: Read in default files.
+
 Wed Dec  9 00:49:12 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f6e75a4e5dce12ffbf289b53223b99290cc399f8..f2a748df01b7aa3282d0bbcb8528e4f72008488a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Tue Dec  8 18:29:05 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * Released GTK+ 1.1.6
+
+       * NEWS: updated
+
+        * gtk/Makefile.am:
+          gtk/testgtk.c:
+          gtk/gtkrc.h:
+          gtk/gtkrc.c: Read in default files.
+
 Wed Dec  9 00:49:12 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h:

diff --git a/Makefile.am b/Makefile.am
index 9df27bcd09200c6f182d2ccffadccc16c186b79d..6f31f7ffe2dba431cf694a0f4a7a6ac4e3b71d62 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,11 +14,14 @@ EXTRA_DIST =        \
        NEWS.pre-1-0    \
        ChangeLog.pre-1-0       \
        README.cvs-commits      \
+       examples/Makefile       \
        examples/README.1ST     \
        examples/extract.awk    \
        examples/extract.sh     \
        examples/aspectframe/Makefile  \
        examples/aspectframe/aspectframe.c  \
+       examples/base/Makefile  \
+       examples/base/base.c \
        examples/buttons/Makefile  \
        examples/buttons/buttons.c  \
        examples/buttons/info.xpm  \

diff --git a/NEWS b/NEWS
index 3952a5624bff18bc4244c1fba7859fffbebe1fa6..4b8007af734203d390730452e5676bb691746589 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,12 @@ What is new in GTK+ 1.1.6:
 * Lots of API clean ups.
 * Incremental freezing abilities.
 * Integrated widgets from the GNOME tree: GtkLayout, GtkPlug and GtkSocket.
-* Read doc/Changes-1.2 to properly adapt your code.
+* New window functions for transient relationship, default size, and 
+  geometry hints
+* Default rc files are now read in (<sysconfdir/etc/gtkrc and ~/.gtkrc)
+  GTK_RC_FILES environment variable and functions are provided to configure
+  this behavior
+* Read doc/Changes-1.2.txt to properly adapt your code.
 * Bug Fixes.
 
 What is new in GTK+ 1.1.5:

diff --git a/docs/Changes-1.2.txt b/docs/Changes-1.2.txt
index 7b6e529ecc5c6fe53156407d4092f113a0f15ff4..50fd3dcecf0f28345dc05b417c04a0d80c5df4e0 100644 (file)
--- a/docs/Changes-1.2.txt
+++ b/docs/Changes-1.2.txt
@@ -100,3 +100,9 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:
   gtk_clist_freeze (clist);
   [...]
   gtk_clist_thaw (clist);
+
+* All functions matching g_message* are deprecated
+
+* Functions *_interp are deprecated, *_full variants are available
+  instead
+

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4643c561032437226ffe7d612c728bc7e59ac850..93a902f69a6c41b55380b820dcb0b17c0da8115b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -343,6 +343,7 @@ INCLUDES = \
        -DG_LOG_DOMAIN=\"Gtk\"                  \
        -DGTK_EXE_PREFIX=\"$(exec_prefix)\"     \
        -DGTK_DATA_PREFIX=\"$(prefix)\"         \
+       -DGTK_SYSCONFDIR=\"$(sysconfdir)\"      \
        -I$(top_srcdir)                         \
        @GTK_DEBUG_FLAGS@                       \
        @GTK_XIM_FLAGS@                         \

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 3de06c5c2cf72b2641b7d0c12a39cf91a438c756..fce03fa803c4a1cf2c4da7479ccd616ac0ec8634 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "gtkrc.h"
 #include "gtkbindings.h"
 #include "gtkthemes.h"
@@ -95,6 +96,7 @@ static void        gtk_rc_clear_styles               (void);
 static void        gtk_rc_append_default_pixmap_path (void);
 static void        gtk_rc_append_default_module_path (void);
 static void        gtk_rc_append_pixmap_path         (gchar *dir);
+static void        gtk_rc_add_initial_default_files  (void);
 
 
 static const GScannerConfig    gtk_rc_scanner_config =
@@ -180,6 +182,10 @@ static GSList *gtk_rc_sets_widget = NULL;
 static GSList *gtk_rc_sets_widget_class = NULL;
 static GSList *gtk_rc_sets_class = NULL;
 
+#define GTK_RC_MAX_DEFAULT_FILES 128
+static gchar *gtk_rc_default_files[GTK_RC_MAX_DEFAULT_FILES];
+static gboolean gtk_rc_auto_parse = TRUE;
+
 #define GTK_RC_MAX_PIXMAP_PATHS 128
 static gchar *pixmap_path[GTK_RC_MAX_PIXMAP_PATHS];
 #define GTK_RC_MAX_MODULE_PATHS 128
@@ -303,15 +309,112 @@ gtk_rc_append_default_module_path(void)
   g_free(path);
 }
 
+static void
+gtk_rc_add_initial_default_files (void)
+{
+  static gint init = FALSE;
+  gchar *var, *str;
+  gchar **files;
+  gint i;
+
+  if (init)
+    return;
+  
+  gtk_rc_default_files[0] = NULL;
+  init = TRUE;
+
+  var = getenv("GTK_RC_FILES");
+  if (var)
+    {
+      files = g_strsplit (var, ":", 128);
+      i=0;
+      while (files[i])
+       {
+         gtk_rc_add_default_file (files[i]);
+         i++;
+       }
+    }
+  else
+    {
+      str = g_malloc (strlen(GTK_SYSCONFDIR) + strlen("/gtkrc"));
+      sprintf (str, "%s%s", GTK_SYSCONFDIR, "/gtkrc");
+      gtk_rc_add_default_file (str);
+
+      var = g_get_home_dir ();
+      str = g_malloc (strlen(var) + strlen("/.gtkrc"));
+      sprintf (str, "%s%s", var, "/.gtkrc");
+      gtk_rc_add_default_file (str);
+    }
+}
+
+void
+gtk_rc_add_default_file (const gchar *file)
+{
+  guint n;
+  
+  gtk_rc_add_initial_default_files ();
+
+  for (n = 0; gtk_rc_default_files[n]; n++) ;
+  if (n >= GTK_RC_MAX_DEFAULT_FILES - 1)
+    return;
+  
+  gtk_rc_default_files[n++] = g_strdup (file);
+  gtk_rc_default_files[n] = NULL;
+}
+
+void
+gtk_rc_set_default_files (gchar **files)
+{
+  gint i;
+
+  gtk_rc_add_initial_default_files ();
+
+  i = 0;
+  while (gtk_rc_default_files[i])
+    {
+      g_free (gtk_rc_default_files[i]);
+      i++;
+    }
+    
+  gtk_rc_default_files[0] = NULL;
+  gtk_rc_auto_parse = FALSE;
+
+  i = 0;
+  while (files[i] != NULL)
+    {
+      gtk_rc_add_default_file (files[i]);
+      i++;
+    }
+}
+
+gchar **
+gtk_rc_get_default_files (void)
+{
+  gtk_rc_add_initial_default_files ();
+
+  return gtk_rc_default_files;
+}
+
 void
 gtk_rc_init (void)
 {
+  guint i;
+
   rc_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_style_hash,
                                  (GCompareFunc) gtk_rc_style_compare);
   pixmap_path[0] = NULL;
   module_path[0] = NULL;
   gtk_rc_append_default_pixmap_path();
   gtk_rc_append_default_module_path();
+
+  gtk_rc_add_initial_default_files ();
+
+  i = 0;
+  while (gtk_rc_default_files[i] != NULL)
+    {
+      gtk_rc_parse (gtk_rc_default_files[i]);
+      i++;
+    }
 }
 
 void

diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h
index bbd65a68ad7c91d064c2c7d22146c5ac99eeaaa2..e7c2437b00ac63bc2a486eddce4f5e9b73839a6f 100644 (file)
--- a/gtk/gtkrc.h
+++ b/gtk/gtkrc.h
@@ -56,6 +56,9 @@ struct _GtkRcStyle
 };
 
 void     gtk_rc_init                   (void);
+void      gtk_rc_add_default_file    (const gchar *filename);
+void      gtk_rc_set_default_files      (gchar **filenames);
+gchar**   gtk_rc_get_default_files      (void);
 void     gtk_rc_parse                  (const gchar *filename);
 void     gtk_rc_parse_string           (const gchar *rc_string);
 gboolean  gtk_rc_reparse_all           (void);

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index 9f936bd844e11a4f9f14dda259d0d2ad82e1f2f6..eb4e6ccba391e567693aaf36afb7d01c1875fc78 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -8350,6 +8350,8 @@ main (int argc, char *argv[])
 
   gtk_set_locale ();
 
+  gtk_rc_add_default_file ("testgtkrc");
+
   gtk_init (&argc, &argv);
 
   gdk_rgb_init ();
@@ -8363,8 +8365,6 @@ main (int argc, char *argv[])
                                1,
                                GTK_TYPE_STRING, "GtkWidgetClass <ctrl><release>9 test");
 
-  gtk_rc_parse ("testgtkrc");
-
   create_main_window ();
 
   gtk_main ();

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 9f936bd844e11a4f9f14dda259d0d2ad82e1f2f6..eb4e6ccba391e567693aaf36afb7d01c1875fc78 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -8350,6 +8350,8 @@ main (int argc, char *argv[])
 
   gtk_set_locale ();
 
+  gtk_rc_add_default_file ("testgtkrc");
+
   gtk_init (&argc, &argv);
 
   gdk_rgb_init ();
@@ -8363,8 +8365,6 @@ main (int argc, char *argv[])
                                1,
                                GTK_TYPE_STRING, "GtkWidgetClass <ctrl><release>9 test");
 
-  gtk_rc_parse ("testgtkrc");
-
   create_main_window ();
 
   gtk_main ();